builder: Make object names a const array

We don't take ownership.

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index d9c8c7e9a67d63249329bd9733ee6bb4d81d9324..c552f9874e3ce518111ae39f08da5276b7d3cb73 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -981,7 +981,7 @@ startup (GApplication *app)
   const char *ids[] = { "appmenu", NULL };
 
   builder = gtk_builder_new ();
-  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", (char **)ids, NULL);
+  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
 
   appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
 

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 1702a37aa95eece309f2fc828ab17496a09d89b7..ba3f367ddc52072bf84b87f64dda4bb9d969c935 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1151,7 +1151,7 @@ gtk_builder_add_from_file (GtkBuilder   *builder,
 gboolean
 gtk_builder_add_objects_from_file (GtkBuilder   *builder,
                                    const gchar  *filename,
-                                   gchar       **object_ids,
+                                   const char  **object_ids,
                                    GError      **error)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -1352,7 +1352,7 @@ gtk_builder_add_from_resource (GtkBuilder   *builder,
 gboolean
 gtk_builder_add_objects_from_resource (GtkBuilder   *builder,
                                        const gchar  *resource_path,
-                                       gchar       **object_ids,
+                                       const char  **object_ids,
                                        GError      **error)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -1483,7 +1483,7 @@ gboolean
 gtk_builder_add_objects_from_string (GtkBuilder   *builder,
                                      const gchar  *buffer,
                                      gssize        length,
-                                     gchar       **object_ids,
+                                     const char  **object_ids,
                                      GError      **error)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);

diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index df49e7a4cf213726c6f0d86460e648ad05037b87..94e8ed292b6a6ca2a7ee6e0239f07538885f9724 100644 (file)
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -114,18 +114,18 @@ gboolean     gtk_builder_add_from_string         (GtkBuilder    *builder,
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_add_objects_from_file   (GtkBuilder    *builder,
                                                   const gchar   *filename,
-                                                  gchar        **object_ids,
+                                                  const char   **object_ids,
                                                   GError       **error);
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_add_objects_from_resource(GtkBuilder    *builder,
                                                   const gchar   *resource_path,
-                                                  gchar        **object_ids,
+                                                  const char   **object_ids,
                                                   GError       **error);
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_add_objects_from_string (GtkBuilder    *builder,
                                                   const gchar   *buffer,
                                                   gssize         length,
-                                                  gchar        **object_ids,
+                                                  const char   **object_ids,
                                                   GError       **error);
 GDK_AVAILABLE_IN_ALL
 GObject*     gtk_builder_get_object              (GtkBuilder    *builder,

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 1301e778e25d62c6cbdde276a049f2448763e1dc..fd2d6d91f7fe9b681e296a4a80399f22d800c1a8 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -1542,7 +1542,7 @@ _gtk_builder_parser_parse_buffer (GtkBuilder   *builder,
                                   const gchar  *filename,
                                   const gchar  *buffer,
                                   gssize        length,
-                                  gchar       **requested_objs,
+                                  const char  **requested_objs,
                                   GError      **error)
 {
   const gchar* domain;

diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index 49833ae9d5929192603929329237590391ec84f7..9ddf24b402d2352f82a0e2016b957ba86970b83a 100644 (file)
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -134,7 +134,7 @@ typedef struct {
   GSList *finalizers;
   GSList *custom_finalizers;
 
-  char **requested_objects; /* NULL if all the objects are requested */
+  const char **requested_objects; /* NULL if all the objects are requested */
   gboolean inside_requested_object;
   gint requested_object_level;
   gint cur_object_level;
@@ -160,7 +160,7 @@ void _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
                                        const gchar *filename,
                                        const gchar *buffer,
                                        gssize length,
-                                       gchar **requested_objs,
+                                       const char **requested_objs,
                                        GError **error);
 GObject * _gtk_builder_construct (GtkBuilder *builder,
                                   ObjectInfo *info,